Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Sun, 25 Apr 2010 00:34:50 +0000 (02:34 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 25 Apr 2010 00:34:50 +0000 (02:34 +0200)

Trivial merge